From: Chong Yidong Date: Wed, 21 Mar 2012 16:56:55 +0000 (+0800) Subject: * info.el (Info-menu): Handle string value of FORK arg. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~2757^2~8 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=69188b79dfc4b933f818d536783b6911140961b7;p=emacs.git * info.el (Info-menu): Handle string value of FORK arg. Fixes: debbugs:10858 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bde1a36d54..db860979577 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-03-21 Drew Adams + + * info.el (Info-menu): Handle string value of FORK arg (Bug#10858). + 2012-03-21 Anmol Khirbat (tiny change) * ido.el (ido-set-current-directory, ido-read-internal) diff --git a/lisp/info.el b/lisp/info.el index b7e2d1eedbe..042ff158362 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2594,7 +2594,9 @@ new buffer." (list item current-prefix-arg)))) ;; there is a problem here in that if several menu items have the same ;; name you can only go to the node of the first with this command. - (Info-goto-node (Info-extract-menu-item menu-item) (if fork menu-item))) + (Info-goto-node (Info-extract-menu-item menu-item) + (and fork + (if (stringp fork) fork menu-item)))) (defun Info-extract-menu-item (menu-item) (setq menu-item (regexp-quote menu-item))